Skip to content

[pull] main from microsoft:main#1306

Merged
pull[bot] merged 8 commits into
code:mainfrom
microsoft:main
May 28, 2026
Merged

[pull] main from microsoft:main#1306
pull[bot] merged 8 commits into
code:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 28, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

DonJayamanne and others added 8 commits May 28, 2026 05:55
…318733)

* feat: enhance session changeset handling with deferred refresh logic

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…318649)

Fix double 2px border above account panel content

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: eli-w-king <201316543+eli-w-king@users.noreply.github.com>
#318717)

feat: update @vscode/codicons to version 0.0.46-14 and add cloudCompact icon

Co-authored-by: mrleemurray <mrleemurray@users.noreply.github.com>
* Fix /doc placing Python docstrings before decorators (#283165)

In Python's tree-sitter grammar, a `decorated_definition` node wraps
`function_definition` / `class_definition`. The previous fall-through to
the default regex `/definition|declaration|declarator/` matched the
outer `decorated_definition`, so the documentable node's range started
at the `@decorator` line. Downstream consumers (LLM prompt context,
docstring insertion anchor) then placed docstrings *above* the
 a Pylance error and broken code.decorator

Match only the inner `function_definition` / `class_definition` for
Python. Add unit tests covering plain/decorated functions, classes, and
methods (including stacked decorators and decorated classes).

Fixes #283165

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: handle cursor-on-decorator for Python /doc

Address review feedback on #283165:

- Match `decorated_definition` in `isDocumentableNode` for Python so
  cursors/selections on the `@decorator` line no longer escape past it to
  the `module` root.
- Introduce `unwrapPythonDecoratedDefinition` and call it in both code
  paths of `_getNodeToDocument` so the returned range is always the inner
  `function_definition`/`class_ excluding the decorator definition`
  regardless of whether the node was found via selection match or via
  walk-up.
- Fix misleading test title for whole-method decorated selection (now
  picks the inner function_definition as advertised).
- Add 4 regression tests for cursor-on-decorator (incl. on `@` sign,
  selection of decorator-only, decorator on method inside class).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: unwrap decorated_definition in _getDocumentableNodeIfOnIdentifier too

Defensive consistency fix from subagent code review. While the Python
tree-sitter grammar makes `function_definition`/`class_definition` (not
`decorated_definition`) the direct parent of name  so thisidentifiers
branch can't trigger  applying the unwrap maintains thetoday
invariant: "the parser API never exposes a Python `decorated_definition`
externally". This protects against future grammar changes or callers
that pass ranges over decorator children.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…#318718)

* xtab: add PatchBased02 line-number variants and strategy-defaults map

Introduce two new prompting strategies that bake their configuration into
the strategy itself:

- PatchBased02WithRecentLineNumbers
- PatchBased02WithoutRecentLineNumbers

Both share the PatchBased02 prompt/response format with currentFile line
numbers in 'withoutSpaceAfter' style, no current-file tags, postscript
enabled, and next-cursor-line prediction disabled. They differ only in
whether recently-viewed documents include line numbers.

Add a STRATEGY_CONFIG map and applyStrategyConfig() helper that overlay
strategy-specific defaults onto the upstream model configuration. Fold
the existing CopilotNesXtab includeTagsInCurrentFile hack into this map
so there is a single source of truth for per-strategy baked-in defaults.

* address review: preserve undefined for unset option bags; add tests
* fix: update font sizes and weights in session styles for consistency

Co-authored-by: Copilot <copilot@github.com>

* fix: update codicon sizes to use compact variants for improved UI consistency

---------

Co-authored-by: mrleemurray <mrleemurray@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
* Fix credit wrapping

* Fix UI
@pull pull Bot locked and limited conversation to collaborators May 28, 2026
@pull pull Bot added the ⤵️ pull label May 28, 2026
@pull pull Bot merged commit 67f6e6e into code:main May 28, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants